Skip to content

address DOM text reinterpreted as HTML alert#38949

Merged
derrickaw merged 5 commits into
apache:masterfrom
derrickaw:20260612_domAlerts
Jun 17, 2026
Merged

address DOM text reinterpreted as HTML alert#38949
derrickaw merged 5 commits into
apache:masterfrom
derrickaw:20260612_domAlerts

Conversation

@derrickaw

@derrickaw derrickaw commented Jun 12, 2026

Copy link
Copy Markdown
Collaborator

Fix CodeQL DOM text alerts


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@derrickaw derrickaw marked this pull request as ready for review June 12, 2026 16:54
@derrickaw derrickaw marked this pull request as draft June 12, 2026 16:54
@derrickaw

Copy link
Copy Markdown
Collaborator Author

/gemini review

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses security concerns related to how DOM elements are queried and how HTML content is rendered within tooltips. By enforcing stricter scoping for selectors and introducing a sanitization step for dynamic content, the changes reduce the risk of malicious script execution and improve the robustness of the UI components.

Highlights

  • Security Hardening: Implemented a sanitization layer for tooltip content using DOMPurify to prevent potential XSS vulnerabilities.
  • DOM Query Optimization: Updated various Bootstrap components to use $(document).find(selector) instead of direct jQuery selector calls to prevent unexpected DOM element reinterpretation.
New Features

🧠 You can now enable Memory (public preview) to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates Bootstrap JS files to use $(document).find(selector) instead of $(selector) and introduces HTML sanitization for tooltips using DOMPurify. The review feedback highlights two critical issues: first, calling $(document).find() with a falsy selector will throw a SyntaxError in jQuery, so guards must be added to return an empty jQuery collection instead; second, sanitizing tooltip content when html is false can cause regressions by stripping plain text characters, so sanitization should only be applied when html is true.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap/alert.js Outdated
Comment thread website/www/site/assets/js/bootstrap/carousel.js Outdated
Comment thread website/www/site/assets/js/bootstrap/collapse.js Outdated
Comment thread website/www/site/assets/js/bootstrap/modal.js Outdated
Comment thread website/www/site/assets/js/bootstrap/tooltip.js Outdated

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates several Bootstrap JavaScript components to query elements using $(document).find(selector) instead of direct jQuery selections, and introduces HTML sanitization for tooltips using DOMPurify. The review feedback correctly highlights that passing empty, null, or undefined selectors to $(document).find() will throw jQuery syntax errors, and recommends adding truthy guards to prevent runtime crashes. Additionally, the feedback suggests adding a type check in the sanitizeHtml function to ensure only string values are passed to DOMPurify.sanitize.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js
Comment thread website/www/site/assets/js/bootstrap/alert.js Outdated
Comment thread website/www/site/assets/js/bootstrap/carousel.js Outdated
Comment thread website/www/site/assets/js/bootstrap/collapse.js Outdated
Comment thread website/www/site/assets/js/bootstrap/modal.js Outdated
Comment thread website/www/site/assets/js/bootstrap/tooltip.js
@derrickaw derrickaw marked this pull request as ready for review June 16, 2026 11:30

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates several Bootstrap JavaScript components to scope element lookups to the document using $(document).find(selector) and introduces HTML sanitization for tooltips using DOMPurify. The review feedback highlights two critical issues: first, the sanitizeHtml function needs a safe HTML-escaping fallback to prevent XSS vulnerabilities if DOMPurify is unavailable; second, lookups with $(document).find(selector) should be wrapped in try/catch blocks to prevent jQuery syntax errors from crashing script execution when handling invalid selectors.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread website/www/site/assets/js/bootstrap.js
Comment thread website/www/site/assets/js/bootstrap/tooltip.js
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap.js Outdated
Comment thread website/www/site/assets/js/bootstrap/alert.js Outdated
Comment thread website/www/site/assets/js/bootstrap/carousel.js Outdated
Comment thread website/www/site/assets/js/bootstrap/collapse.js Outdated
Comment thread website/www/site/assets/js/bootstrap/dropdown.js Outdated
Comment thread website/www/site/assets/js/bootstrap/modal.js Outdated
@derrickaw derrickaw marked this pull request as draft June 16, 2026 11:40
@derrickaw derrickaw marked this pull request as ready for review June 16, 2026 14:14

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces safer jQuery selector querying across several Bootstrap components by wrapping selector lookups in try-catch blocks. It also adds HTML sanitization for tooltips using DOMPurify with a fallback escaping mechanism. The review feedback correctly highlights that the fallback escaping mechanism in sanitizeHtml will break the html: true option for tooltips and popovers when DOMPurify is unavailable, as it escapes all HTML tags and renders them as plain text. It is recommended to return the string unmodified if DOMPurify is not present to avoid visual regressions.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread website/www/site/assets/js/bootstrap.js
Comment thread website/www/site/assets/js/bootstrap/tooltip.js
@github-actions

Copy link
Copy Markdown
Contributor

Assigning reviewers:

R: @damccorm for label website.

Note: If you would like to opt out of this review, comment assign to next reviewer.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@damccorm damccorm left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@derrickaw derrickaw merged commit 597f925 into apache:master Jun 17, 2026
12 checks passed
@derrickaw derrickaw deleted the 20260612_domAlerts branch June 17, 2026 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants